Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 00:21:29 +0000 (17:21 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 6 Aug 2011 00:21:29 +0000 (17:21 -0700)
commit5e94390b55a0dcb5d05122e06179e48103b37ef4
tree90b54ab6d7f2b2eb08226b881e9799ca707bfb40
parentc33209e8015430d9c53b965014b395e7abf0517d
parent9e434ab4711570d011f04b9f1a5ae24a6cb217ba
Merge from trunk.
src/xdisp.c